Added more INVOKE_ON_NEXT's