Main update to Singleton part 1