fixes
merged suo file