Added comments from Amit