Updates to Challenge controller