Refactored to pass bukiwishes by reference