Right before changes for coordinate output