2nd round of changes to adil s file