now integrated changes