Fixed Spacing and improved PM Support