swapping order of funcs & conditionals