[TASK] - working changes