add some but also have bug