Added Johan's recommendations
Resolved conflicts