address review by @fredj