YJ- updated hash functions in Block and Point