Improved tolerance and positioning