recompiled and tidied up, changed default CR