updated parts and additions