add 14/06/03
some bugs remain