WIP: faster (?) whitening?