Restored comments again