Update to fix type, coordinates