nanny flow 2

made changes almost done