General update, refreshed all function files