Added version with holdsubcode option