update based on @ElDeveloper's annoying recommendations...