modify on 20140617 for testing purpose