Changing the interface a bit