lots of changes, just getting current