#1 Added Fields and Checks