Made changes to behaviors to allow for updates by the user.