t2: part-2 added
Functions Logic Updated