Changed the interface slightly