Here some flexibility added

Review it, please.