commented out irrelevant functions, updated function prefixes