failed adding code for location and comments