Updates to allow manual positioning and updates to set the target earlier