BUG: subset needed for motion params as well