Manual add of activities that watch can't track.

I do aqua aerobics 3 times a week. Once a week I go to hot yoga (it can be from +36' to 37') so I don't wear my watch. I Like avtivity app and I can't find a better app, but it loses all sence of daily history when it doesn't have information about my activities. If only i could add avarage number of burned calories.

I ride bike also, i live in a small town, i cycle 5-10 times a day for 5-10 min, sometimes 20-30 min and i just forget to start or stop activity on app. It would be cool if i could set in settings that i cycle and watch could recognise when i walk and when i cycle.