[#80] task logick chenges