final changed and tweaks