Untangling occupation and activity.

Untangling occupation and activity.