added username & location