Updated Names and Consolidated Functions