Added label
Cleaned up singleton
Experimenting with updating label