addressing @josenavas comments