edit

combine still have bug