added build optimization