tweaked some more