Simplify listeners, bump