One-line if statements added.