fix commit - ray 5,6,7