Updated to include various application changes.