Added Spencer's edits back in that accidentally got lost when adding Abdullah's edits and some new ones by Spencer.