fixed shifting coord
edited slightly
trying to merge
changed to match ollies commit