adding modifications made on Linda