some comment were included