Committing James' changes.