finished the new user system and replaced it with the old system