Safety commit. Current problem: reference visualization