I still think we should have current behaviour + new behaviour available