Some changes including check for MD5sum