Made changes for ES-1002