switched out all instances of components