New parts and corrections