Task.py changes