updated for new interface