adjustments for new interface