prepared a lot of stuff for new task handling... it was a hell to cleanup unused stuff!!!