implemented pgb team feedback, thanks!