Added stuff, probably some errors