Added motion handlers