Handled comments for X32