More work on the transition code template