lots of changes
did things