big changes
more updates