added changes to singleton