Functions Updates and Commenting