Amit's code - 1.3