Tweak to IfCondtions