implement atagars suggestions, thanks!