Changed how spacing is handled for performance
Changed how spacing is handled for performance