Make it even more flexible.