location state and other updates
resolved merge conflicts