2.0.3.8 (final improvements)