some changes to short vs long