merged implementations of our codes, conformed to standards