Added missing parameter and Comments