integrating @davivels remarks