improve differentiation between 1 and 2