addded the missed components