changed coord refs
fixed merge