some task reworked