started changing to android design from singleton