few tweaks max page added