more flexibility added