add conditional stuff