Begin merge with Paul's Portal