Added wishing logic