Added a bit more flexibility