Make it a little more flexible