Update due to safety version control