added checking for the user
stuff