Shifted things around some, untested but SHOULD work, hopefully.