my changes to caffe_common