Update from SheriffSoco

Hopefully this is correct