updated spacing, etc.