merge with davinci's update
fixed some merged issues