Changes after working on epatches CMS