tweaked things around a bit