slightly improved bu there is still a wierd second match