Make conditional (7/48)

Make conditional