Temporarily moved items back into library.py.