rework in preparation to page 2