final changes to ES