Few changes related to the coordinates