Hopefully new Ent system is completely fine now, and fully used correctly.