[TASK] Last changes