Comments  optimized