added ability to have 'vanilla' build