Added in Moe's listeners