second commit

still have bug