incorporated feedback from @rhauck and @sylvain-galineau