Enhancd comments