Optimized 1, new solved 4

Optimized 1, new solved 4