change builder for new n2o compatibilty