Update from sfdc

Probably I should've done this a while ago.