Added the raid info & when.. made it abit more robust