singleton and linked list changes