added vanilla build capability