crypto - second draft, including suggested changes