updates in page logic by Jeff's request