More modifications, add some ch7 stuff