more work done
bootstrap upgrade