Reconfigured the interface a bit