[dev-workshop] Big update