We need to implement a few features to enhance the variety of challenges: - [x] #371 - [x] #372 - [x] #373