More Testing, fixed IF loop