Tweaks and optimize