added some extra options for testing