Added support for 2nd argument that allows one to pass eventid, rather than just assuming next event