Updated to check all fields