udpated multipage support