modifications made by Chris