another round of updates to fix motion issue