Congrats on your efforts BF to date that is brilliant. We started offering DS water in a sippy cup and he stopped waking for night feeds super quick. I felt bad because I know he was wanting to feed for comfort more than anything but DH and I were getting soooooo tired and it was just something that although I didn't feel good about doing I knew I had to do (in our situation). Shortly after that (14.5mths) he self weaning off his bed time feed. I was a little sad but was happy I'd been able to offer him BM for the last 14.5mths. He still wakes some nights but settles easier. Good luck.