added some new stuff!