Made the listing code more shrek-friendly