Added comments for future changes - 2