User checking added