Fixing the logic some more!