Quality issues during transition

Quality issues during transition