Some modifictions.