lots n lots of changes