Small rework on the design