Programming Test

Changes done as required