Updated ICD

Implements Professor Dao's critique