Tweks to Phil's changes