Revised CRM files with commented out code (preliminary changes to be tested).