More tweaks again