12 Commits (deconstruction-fixes)