CJDv18 added more support for multiple pages