Added comments from Sasa