2014-09-19 analysis module revise