TODO modified for current tasks