a whole lot of changes and additions