Update from MotionPrediction/exp branch