Cut the position-save delay in half and add a TODO