Add conditional sugar

Remove compiler warning
Checkpoint