fix interface according to the proposal