Refine a bit
CAN HAZ DATA
Some changes