adding back in some missing parts