updated all if statements