Reverted to options instead of preferences