Added some function calls that should probably have been here sooner.