Added more functionality to challenges