fixed and fully running

all test cases working no problem