Changed the interface some