master: removed stadard pagination, need to trial a few more things