finish leftover changes w. new interface