fixed structure and comment