added Hash, moved Encrypt