Updating my fork with Jenny's changes