updated edits from Surya