Updated the way it handles no items- mark2