Pulling David's changes into my fork