Updates following merge with Paul's changes