Synced with Chris's changes
Synced with