+ added some new stuff