ShortTabkes implementation changed