Switch to onspawn instead of onclasschange