If we want to change this for 2.2 what would potential solutions be?