Improve selectable scaffold