8355 rules finished and some function extension