#29: Added short codes anywhere