Optimization based on version 2.0