Simplified the design