A20 adaptation
For mac build