attempt to make more sane