Many improvements, more flexibility