Made a buttload of changes