More work on coordinate saving