All rework, and with exceptions management #78 #87