Edited SmashListener