added the other components