Update with CalcCoach Specific changes