adding @ElDeveloper suggestions