Optimization
Comment update
Bugfix