Code with most of planned changes for Saturday (2).