- added and modified a lot of stuff
dsfdf