Fixed and optimised both coordinates, still not 100% accurate