some changes 20140320 2100