minor changes
merge conflict
added split pages and header