1.6.1. restructured
Double check 1.6 spec vs 1.6.1 if we have not missed anything. (ask Stan for script)