Changes to Jessica's stuff to make it work better