tweaked a lot