Updated short codes