Final Changes for M8