Class 4, Handler: Improve Solution