adding sw compensation
updating
updating
fixign conflicts