addressing @josenavas and @ElDeveloper comments