ticket:4 redo task int the right way