Update 1.1

Optimized