fix1
Mergerd text for Fix1