Fixed #336, Fixed #320, able to use basic dance