r1202 + all options have moved into the database