update behaviors
merge ian's changes