make mentions smarter from cdzombak fork