Tweak logic + design