Changed client to use new form of challenges