Addressing @ElDeveloper's comments