Make conditional (25/48)

Make conditional