addressing @adamrp and @josenavas's comments