Added user funcitonality