rework conditionals and equality section