Make conditional (22/48)

Make conditional