seems to work a bi better now