Amit's recommended changes