Fixed interface, merged code.