Struggler: Some optimizations

Some optimizations