Included changes/features based on 'A Room by the Fire'.