update 06, almost finish