updated pages from master