bug fix and add options method