Modified after merge