for CIYAM: quickfix and notes