Optimized the Design