addressing @ElDeveloper comments