Copied in Alex's changes, these seemed to get lost somewhere?