made all fuzzy
 Merge