CH4,and part of CH5 changes. Only thing missin is Hibernate and the logger