ActivityOne final changes ex.A