You seem to be suggesting that we should, first of all, harmonize the two documents, the code and the act. I sense that you would like to take the code in the direction of the act so that in many cases you're dealing with the same rules for both.
On May 31st, 2012. See this statement in context.