yhsiang: pushed to jade-fixes...