again with the tweaks