today's(20130602) work over, some details modified