added ready check
fixed user check