Making it work conistently