Latest Code. Fixed Commenting