Update: Move static into visualisation