Shall we add a similar option for this hardcoded 15? Or combine the two somehow?