Added Phil's changes