remastering optimization stuff...