Merged from simplified source insertion
Updated protocol visualization