Working on the behavior and documentation