2170 -- COMMIT 17 : Last commit before restructuring.