changed username to be flexable