Added persistence, timer, endpage