WIP: test different optimization scheme, try 2