just tweaked a few things