Added some code so me and satoshi can code separately on different documents