Safety commit. Current Task: Dashboard