Modified the design again