made things a little more sensible