merged lan's comment
merged Ian's comment