Improve position constraint