WIP: opt v2

Change-Id: I147dfc3cc01353712fd3f7d2bbe58a9968b1d0e4