INteractor fixes