Fixed promotion, lot more things to address for new code