Minor stuff. ditching interface.