Split references
Paul Wouters feedback