Made some huge changes