Improve the promotion

Change-Id: I806b7f74192100c9a828d0f542391b22ab19b4db