reworked the design