Moved the passage to util.py