Some more tweaks with Animations