Update related change to handle location