added some new options, needs verification