Changing based on CR