Lots of changes (esp. with kernel)