continuing the optimization of the class generated output