ES_AR Updated; Refactor