One more shot at fixing the conditional statment