more updates to tackle motion bug