Make conditional (47/48)

Make conditional