Many changes to speed up the combo a bit and hopefully make it better