Added half range optomization