partial implementation of Next Steps changes, fixed issue with Criminal Canada not accounting for question 2b