simplifying implementation based on Selahs email