Removed the old functions that simply counted the number of functions