added per page support