improve for 1st page