added the db username and formatting