Changed to SHA-2
Merged