Added some configuration options. still have low accuracy