add some changes for changed interfaces