revamp draft-interface