Canadian Pacific unveils new plan, takes heat