ooops ... bad if statement organization