Amend approach based on feedback from @barijaona