Modified a lot of stuff...don't remember exactly what