added hash+salt
merge