Modules

Replace statements with equivalents which succeed or die