Cardio and strength. Still very short sessions but just about what my knee can take.
I woke up in the middle of the night with it stiff and aching. Of course that was after showing Marcie in Rally twice, doing conformation class with Macy AND working out.