WIZAARD
Add Phil's changes.