Optimized code update v2.