latests updates before merge with Pragya's

(newest in file within folder titled updates)