initial changes from CM