added some new stuff