Changes by docelic.