all new fixes
merged
merge on tuesday