Phase02:profile-data plus fixes for phase01