[TASK] Adjustements following client's request