add 8_04 & fix 8_03