update 06.08 #2