Add behaviors
Fix bug
Rewrite