tweaks and changes again