Changes done according to Acceptance Test Document.