added handlers and xp listener