Both, as well as five small cups from a water dispenser. The water dispenser was the best, that gets 11/10 for coldness and freshness, the tap comes second as it was also quite cold and fresh so it gets 10/10, bottled comes last, the shop hadn't stored it properly so it was slightly warm but Evian are well packaged so they still get 9/10
Overall 10/10, well done water, you got my vote