move it up to a return at the top
fix condition