Add in a little flexibility