LOTS OF CHANGES OMFG