went back to inline if statements