Working options again. Using the new APIs.