Updated with working interaction