not using _entity any longer.