Changes for enterprise

works on staging and enterprise
why has this been removed?