Light Version of the Code
Minor Changes