improvements to the behavior