ES update + part 1 of work