updated awkward coding from buddyblind