Updated the criteria for end pages

Thanks to Richard Watson for this