Changes to method of serving pages