adding a check to see what the boolean fields actual are instead of just seeing if they were set