Beginning modifications, added user info