removed username requirement on header
resolved merge conflict on header