Changes for enterprise

works on staging and enterprise