Add MAXBLOCK limit and progressive check