Work still needed on safety