modifications made by Jorge