Updated formula, added challenge toolbar