Behavior modification implemented. TODO: test.