Card 496 Fixing typo and shifting logitc around