GL Page optimization changes