updated for herkou push