doing:test
fix bugs