upgraded entity system