MOTM-874: Adds the stuff the previous PR removed... lame
Merge pull request #611 from m038/MOTM-874

MOTM-874: Adds the stuff the previous PR removed... lame