Re-added md5 stuff