Changing stuff to use new functions.