Added in critical data grabber