Update for consolidation of like functions.