20130711 Refactory and add notes.