Ass. Light and Gesture fix