Updated NewUser with Shiva's file
Related NewUser stuff