Upgrading to the newer elastic & river