moved more stuff to utilities.py