Updated solutions for some of the exceptions