added username option