Modified helping functions in common.py => tracking works.