Improve Carrier Safety

slant