Added comments and notes