Minimal changes - currently the missing references are the main problem.