changes based on @ElDeveloper's comments