minor changes in interface (oops)