Change conditions for more logic