changes and marking where refactor is needed