integrating alpha5 updates