Added conditional short/long handling