Final changes by AP.
Fixed ref.