20140520 Add more comments