enhance for page gen