cleaned it up a little, still ugly noise