Prepared dev from qa changes and tested admin/non