+ minor changes on interface