Doug's changes