Separating full and short version