Change the interface a little