finish up major components