Lots of changes since bootstrap (commit more)