made some huge changes