update 11-09
update 12-9