Adressing @ElDeveloper's comments