Adapted activity-O

Adapted activity-O