Updating positioning to be more dynamic