OK ... hash is now used. This should speed things up considerably