revised secondary pages mainly
Merge fix