modification on Yue's scenarios