Improved incremental hashing (still not working)