Integrating @maubry's comments