Adjusted as per Mitch's comments