more pages ported