need a few tweaks