all Phil's changes