FitAssist - calorie logic updated