tweaked a bit more