Updated controllers and building out artist