made things a little more flexy