This should be in smash