changed variable names to match corresponding is_* flags