Added lots of stuff I can't remember