changes
merged. md5 working