Modied files to enable SWP additions