Updating Calculator with Return Functionality from Lab