added other components