Chnages made as per UseCase 3 (fresh inputs from Mr. Chirita).