Added some extra behaviors