Added additional conditional comment code and pagination code