WIP: corrected coordinates