major ESB edits