Pull in ElvinSpellmaker's Updates