Changes made by Nauman