Some tweaking to the interface.