Starting to adjust logic for bottle