working on text and full inegration