Altered loading of general functions file