#2 continuing snapshot of es logic