First alternate Options commit
Revert "First alternate Options commit"

This reverts commit 2de712d6494bb39c52f1475352bef8af0fc9e209.
First alternate Options commit