finishing now with more flexibility