Efficiency: modify interface, testing