from zhanglintc to bernard

update from zhanglintc