lots & lots of changes