Incorporated Mont's changes.