added some new stuff
updated