switch to main-new, add more into select creation