logic for email and singletonns added