reducing code size again!