Add a little more flexiblity.