Turned into singleton and updated instantiation in 9317e6d