changed some in interface