update 2012-5-13 from lab.