merge Austin Zheng's built-in changes