Sync

Sync with Yourdon's changes