Alex's code - he's agreed to look again at this before he merges.