Replaced all of the old repetitive definitions with calls to the new func.