Rewrote most of the Data inspection