Changes as per Functional Spec