removed container and added instantiator