some changes (final±)