Additional updates to make the autonomous selection work correctly