rearranged new position logic due to buggy behaviour
rearranged new position logic due to buggy behaviour

rossengeorgiev/habitat-mobile-tracker,rossengeorgiev/habitat-mobile-tracker,rossengeorgiev/habitat-mobile-tracker