updated my BUILD update too to the approach you suggested - much cleaner now