make use of conditional expressions … forgot to update some statements …