changes by Brice in behavior setup