almost all changes since OTA CMS was ready