a lot of changes, almost done upgrading system