Basic functionality for avoiding re-opt is working