Fixing coordinate system... not all done