Updated for new behaviors