updated behavior to v2.0