Updated according to Gabe's comments