updated for page composer