Final polish for M4