Incorporate Esdras' review