Safety and marking

Safety and marking