obanyc-1964 optimizing build