First update with mock-up code.