Added Angeleah's changes manually.