Added better drink logic