new interface, bug fix