Add in cms bug fix and new renderer