Changes by ftorghele.