Changes made by esolis2.