make this work better on enterprise