fixed interaction, updated framework