Update 2 - fix coords + move