adding suggestions made by @ElDeveloper