Updated coordiantes
function name changed
Fixed merge conflict