Improved spacing