Need to fix x/y. Added ang correction.