Fix'd

This is what we turned in for ITC