Added comments after merge