final commit for conditionals wacky