EAGLESIX-2696 Added more comments to help me remember what to fix :-P