More updates for mock-ups.