Grabbing Ted's changes