new optimization code WIP
new optimization code, edit access, WIP