Options map revised