modifications by Chris