architecture commit #1