Optimized v1.0.1