added ability to specify username