updated with separate pages