Spacing changes
Little work with new option