Incorporated feedback from @isuperbb. Thank you @isuperbb.