Added behavior control