Paul's changes during my fork