update spacing, rework working