[TASK] made some improvements