some changes
it seems to work