changed modules/parts heavily