added more stuff
changed