Philip's changes