Major update, as discussed with Fred