Added self motion