Updated the way it handles no items