Continued view + refactord code + cught exceptions