readded missing components from previous commits