adding changes for username and others