More checks and trying to disable enter